Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d3650a0

Browse files
committedOct 3, 2014
Unfortunately can't map "language" to "@language" the way I hoped we
could... existing JSON-LD parsers do not handle it well
1 parent 2b74c41 commit d3650a0

3 files changed

+9
-14
lines changed
 

‎activitystreams2-context.jsonld

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"as1" : "http://activitystrea.ms/1.0/",
1818
"id": "@id",
1919
"objectType": "@type",
20-
"language": "@language",
20+
"language": "as:language",
2121
"displayName": {
2222
"@id": "as:displayName",
2323
"@container": "@language"

‎activitystreams2-vocabulary.html

+1-5
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ <h2>Terms</h2>
352352

353353
<tbody>
354354
<tr>
355-
<td rowspan="4" valign="top"><dfn>language</dfn></td>
355+
<td rowspan="3" valign="top"><dfn>language</dfn></td>
356356
<td valign="top" width="10%">URI:</td>
357357
<td valign="top"><code>http://activitystrea.ms/2.0/language</code></td>
358358
</tr>
@@ -368,10 +368,6 @@ <h2>Terms</h2>
368368
<td valign="top">Domain:</td>
369369
<td valign="top"><a title="Object"><code>Object</code></a> | <a title="Link"><code>Link</code></a></td>
370370
</tr>
371-
<tr>
372-
<td valign="top">Alias Of:</td>
373-
<td valign="top">[[!JSON-LD]] "@language"</td>
374-
</tr>
375371
</tbody>
376372

377373
<tbody>

‎activitystreams2.html

+7-8
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ <h2>Basic activity with some additional detail</h2>
242242
</figcaption>
243243
<pre class="example highlight json">{
244244
"@type": "http://activitystrea.ms/2.0/Activity",
245-
"@language": "en",
245+
"language": "en",
246246
"verb": "post",
247247
"published": "2011-02-10T15:04:55Z",
248248
"actor": {
@@ -289,7 +289,7 @@ <h2>An extended activity</h2>
289289
"items" : [
290290
{
291291
"@type": "http://activitystrea.ms/2.0/Activity",
292-
"@language": "en",
292+
"language": "en",
293293
"verb": "post",
294294
"published": "2011-02-10T15:04:55Z",
295295
"generator": "http://example.org/activities-app",
@@ -412,14 +412,13 @@ <h2><dfn title="Object" id="asobject">Object</dfn></h2>
412412
at least contain a <a href="activitystreams2-vocabulary.html#dfn-displayname">displayName</a>.
413413
</p>
414414

415-
<figure><figcaption>Following is an example Object that uses the JSON-ID <code>@id</code>, <code>@type</code>
416-
and <code>@language</code> JSON-LD keywords to express the global identifier, object type and default
417-
language:</figcaption>
415+
<figure><figcaption>Following is an example Object that uses the JSON-ID <code>@id</code> and <code>@type</code>
416+
JSON-LD keywords to express the global identifier and object type:</figcaption>
418417
<pre class="example highlight json">
419418
{
420-
"@id": "http://example.org/foo",
419+
"@id": "http://example.org/foo",f
421420
"@type": "http://example.org/types/Note",
422-
"@language": "en",
421+
"language": "en",
423422
"displayName": "This is a note",
424423
"author": {
425424
"@id": "urn:example:person:joe",
@@ -454,7 +453,7 @@ <h2><dfn title="NaturalLanguageValue">Natural Language Values</dfn></h2>
454453
<figure>
455454
<figcaption>A single String value using the default language:</figcaption>
456455
<pre class="example highlight json">{
457-
"@language": "en",
456+
"language": "en",
458457
<b>"displayName": "This is the title"</b>
459458
}</pre></figure>
460459

0 commit comments

Comments
 (0)
Please sign in to comment.